Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Tue, 16 Aug 2005 18:09:07 +0000 (10:09 -0800)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Tue, 16 Aug 2005 18:09:07 +0000 (10:09 -0800)

Trivial merge